x11: Add "pointer" to the is-not-a-touchscreen device name checks
authorCarlos Garnacho <carlosg@gnome.org>
Tue, 17 Nov 2015 14:36:08 +0000 (15:36 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Tue, 17 Nov 2015 15:22:06 +0000 (16:22 +0100)
Commit 1266d15c4 also broke Xwayland, as it does the same trick
than VMWare pointers. Let's extend the heuristic to check for "pointer"
in the device name, what can possibly go wrong...

https://bugzilla.gnome.org/show_bug.cgi?id=757358

gdk/x11/gdkdevicemanager-xi2.c

index 4be9bbb7c2dc6a6295486e0c6dc67b12314427c9..69e9b35f0bc6ee28d35021ee2fcffc4ed68b768f 100644 (file)
@@ -427,6 +427,7 @@ create_device (GdkDeviceManager *device_manager,
                strstr (tmp_name, "pen"))
         input_source = GDK_SOURCE_PEN;
       else if (!strstr (tmp_name, "mouse") &&
+               !strstr (tmp_name, "pointer") &&
                has_abs_axes (display, dev->classes, dev->num_classes))
         input_source = GDK_SOURCE_TOUCHSCREEN;
       else